Before Cleanup

Cleanup is at hand