Stripping layouts of grid layout
Removing 960 code