diff --git a/ClassicalSharp/Entities/Components/PhysicsComponent.cs b/ClassicalSharp/Entities/Components/PhysicsComponent.cs
index 7e29c0257..77e5b930d 100644
--- a/ClassicalSharp/Entities/Components/PhysicsComponent.cs
+++ b/ClassicalSharp/Entities/Components/PhysicsComponent.cs
@@ -166,9 +166,6 @@ namespace ClassicalSharp.Entities {
 		}
 		
 		void MoveNormal( float xMoving, float zMoving, float factor, Vector3 drag, float gravity, float yMul ) {
-			if(entity.BlockUnderFeet == 8 || entity.BlockUnderFeet == 9 || entity.BlockUnderFeet == 10 || entity.BlockUnderFeet == 11) {
-				entity.Velocity.Y += 2; entity.Velocity.Y = 0;
-			}
 			AdjHeadingVelocity( zMoving, xMoving, factor );
 			Move( xMoving, zMoving, factor, drag, gravity, yMul );
 		}
diff --git a/ClassicalSharp/Utils/Options.cs b/ClassicalSharp/Utils/Options.cs
index ba70b25b0..4fa37dba4 100644
--- a/ClassicalSharp/Utils/Options.cs
+++ b/ClassicalSharp/Utils/Options.cs
@@ -163,13 +163,13 @@ namespace ClassicalSharp {
 		static void LoadFrom( StreamReader reader ) {
 			string line;
 			// remove all the unchanged options
-			List<string> toRemoveKeys = new List<string>();
+			List<string> toRemove = new List<string>();
 			foreach( KeyValuePair<string, string> kvp in OptionsSet ) {
 				if( !OptionsChanged.ContainsKey( kvp.Key ) )
-				   toRemoveKeys.Add( kvp.Key );
+				   toRemove.Add( kvp.Key );
 			}
-			foreach( string key in toRemoveKeys )
-				OptionsSet.Remove( key );
+			for( int i = 0; i < toRemove.Count; i++ )
+				OptionsSet.Remove( toRemove[i] );
 			
 			while( (line = reader.ReadLine()) != null ) {
 				if( line.Length == 0 || line[0] == '#' ) continue;