cleanup of media & Core