Remove unused listeners.
Remove dependence on old Loader deprecated API.
Remove dependence on old Loader deprecated API.
Mark API as deprecated