Removed useless sub grid
Removed old code