Remove some useless stuff
Get the grid selection on the Mac working again