Cleanup

The time has come