The right thing to do and something I've been wanting to do for a while is deprecate AbstractSinkManager.  It isn't necessary anymore.  In the meantime, yes it can be cleaned up in PluginLoader.