Cleaning up
Cleaning up for new version