Cleaned up
Cleanup done