Basic Cleanup done