More clean up

These will get synced automatically after you lunch hammerhead