Cleanup and updated media_profiles.xml