clean up. Added media_utils