cleaned up some unneeded imports in Geometric.hs and other minor changes