Remove GridUnit foolishness