Version bump, cleanup