Some Cleanup
Cleanup