diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h
index 90de593c4..7128457a3 100644
--- a/src/driver/fb_generic.h
+++ b/src/driver/fb_generic.h
@@ -290,8 +290,6 @@ class CFrameBuffer : public sigc::trackable
 		virtual void blitBox2FB(const fb_pixel_t* boxBuf, const uint32_t& width, const uint32_t& height, const uint32_t& xoff, const uint32_t& yoff);
 
 		virtual void mark(int x, int y, int dx, int dy);
-/* Remove this when pu/fb-setmode branch is merged to master */
-#define SCALE2RES_DEFINED
 		virtual int scale2Res(int size) { return size; };
 		virtual bool fullHdAvailable() { return false; };
 		virtual void setOsdResolutions();
diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index 552e25792..fa1e1bb82 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -1391,12 +1391,7 @@ int CLuaInstance::scale2Res(lua_State *L)
 	int value, ret;
 	value = luaL_checkint(L, 2);
 
-	/* Remove this when pu/fb-setmode branch is merged to master */
-#ifdef SCALE2RES_DEFINED
 	ret = CFrameBuffer::getInstance()->scale2Res(value);
-#else
-	ret = value;
-#endif
 	lua_pushinteger(L, ret);
 	return 1;
 }