diff --git a/ref/gl/gl_local.h b/ref/gl/gl_local.h
index 95138b6d..e6e77122 100644
--- a/ref/gl/gl_local.h
+++ b/ref/gl/gl_local.h
@@ -721,8 +721,6 @@ extern convar_t	gl_stencilbits;
 extern convar_t	gl_overbright;
 extern convar_t gl_fog;
 extern convar_t	gl_litwater_force;
-extern convar_t	gl_litwater_minlight;
-extern convar_t	gl_litwater_scale;
 
 extern convar_t	r_lighting_ambient;
 extern convar_t	r_studio_lambert;
diff --git a/ref/gl/gl_opengl.c b/ref/gl/gl_opengl.c
index 0588f825..05a130f1 100644
--- a/ref/gl/gl_opengl.c
+++ b/ref/gl/gl_opengl.c
@@ -23,9 +23,6 @@ CVAR_DEFINE_AUTO( gl_stencilbits, "8", FCVAR_GLCONFIG|FCVAR_READ_ONLY, "pixelfor
 CVAR_DEFINE_AUTO( gl_overbright, "1", FCVAR_GLCONFIG, "overbrights" );
 CVAR_DEFINE_AUTO( gl_fog, "1", FCVAR_GLCONFIG, "allow for rendering fog using built-in OpenGL fog implementation" );
 CVAR_DEFINE_AUTO( gl_litwater_force, "0", FCVAR_GLCONFIG, "force enable lightmapped water, even if support not declared in the map" );
-CVAR_DEFINE_AUTO( gl_litwater_minlight, "0", FCVAR_GLCONFIG, "minimal light water receives, helps avoid too dark lightmapped water" );
-CVAR_DEFINE_AUTO( gl_litwater_scale, "3", FCVAR_GLCONFIG, "lightmapped water scale factor" );
-CVAR_DEFINE_AUTO( r_lighting_extended, "1", FCVAR_GLCONFIG, "allow to get lighting from world and bmodels" );
 CVAR_DEFINE_AUTO( r_lighting_ambient, "0.3", FCVAR_GLCONFIG, "map ambient lighting scale" );
 CVAR_DEFINE_AUTO( r_detailtextures, "1", FCVAR_GLCONFIG, "enable detail textures support" );
 CVAR_DEFINE_AUTO( r_novis, "0", 0, "ignore vis information (perfomance test)" );
@@ -1188,8 +1185,6 @@ static void GL_InitCommands( void )
 	gEngfuncs.Cvar_RegisterVariable( &gl_overbright );
 	gEngfuncs.Cvar_RegisterVariable( &gl_fog );
 	gEngfuncs.Cvar_RegisterVariable( &gl_litwater_force );
-	gEngfuncs.Cvar_RegisterVariable( &gl_litwater_minlight );
-	gEngfuncs.Cvar_RegisterVariable( &gl_litwater_scale );
 
 	gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset );
 	gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset_bmodels );
diff --git a/ref/gl/gl_rmain.c b/ref/gl/gl_rmain.c
index b5108c3a..05684861 100644
--- a/ref/gl/gl_rmain.c
+++ b/ref/gl/gl_rmain.c
@@ -1035,14 +1035,6 @@ static void R_CheckCvars( void )
 		rebuild = true;
 	}
 
-	// we only recalculate lightmap on the fly if map hasn't declared support for lightmapped water
-	if( !FBitSet( tr.world->flags, FWORLD_HAS_LITWATER ) && FBitSet( gl_litwater_scale.flags|gl_litwater_minlight.flags, FCVAR_CHANGED ))
-	{
-		rebuild = true;
-		ClearBits( gl_litwater_scale.flags, FCVAR_CHANGED );
-		ClearBits( gl_litwater_minlight.flags, FCVAR_CHANGED );
-	}
-
 	if( rebuild )
 		R_GammaChanged( false );
 }
diff --git a/ref/gl/gl_rsurf.c b/ref/gl/gl_rsurf.c
index 8750c466..df6f0127 100644
--- a/ref/gl/gl_rsurf.c
+++ b/ref/gl/gl_rsurf.c
@@ -92,11 +92,9 @@ static int Mod_LightmappedWaterMinlight( void )
 	{
 		if( tr.world->litwater_minlight >= 0 )
 			return tr.world->litwater_minlight;
-
-		return 0;
 	}
 
-	return Q_max( (int)gl_litwater_minlight.value, 0 );
+	return 0;
 }
 
 static float Mod_LightmappedWaterScale( void )
@@ -106,10 +104,9 @@ static float Mod_LightmappedWaterScale( void )
 		if( tr.world->litwater_scale >= 0.0f )
 			return tr.world->litwater_scale;
 
-		return 1.0f;
 	}
 
-	return gl_litwater_scale.value;
+	return 1.0f;
 }
 
 byte *Mod_GetCurrentVis( void )
@@ -1054,7 +1051,7 @@ static void EmitWaterLightPolys( msurface_t *warp, float soffset, float toffset,
 	float waveHeight = RI.currententity->curstate.scale;
 
 	// set the current waveheight
-	if( warp->polys->verts[0][2] >= RI.vieworg[2] )
+	if( warp->polys->verts[0][2] >= RI.rvp.vieworigin[2] )
 		waveHeight = -waveHeight;
 
 	if( useQuads )