refractored and deleted unused grid classes