Revert "cleanup unneeded callbacks"

This reverts commit d38f60adb72c4598ab91885b07cddd9d12dd9d2a.
prevent operating on null if repoListnnot set