Clean version 1
Cleanup