Cleanup and increment version number