Clean up and version bump