Grid clearing and improvements