Clean up Media class