Cleanup & version bump