Updating version number, cleanup