FIXED: Clean up versioning for distribution