new media updates
remove old includes