Remove for now

These are used for the g2 (We arent building them atm), and seem to be breaking hammerhead.