general improvments
correctly handle removal of a MediaLibrary