Finished version 1
Cleanup