Version bump, clean up