Loader: Removing references to deprecated items.