cleanup and version bump for packaging