removed rerdundant callback
Revert "removed rerdundant callback"

This reverts commit 18f4f8f8791374272d4e215d43b227ba78a5a3b6.
removed redundant callback, + cleanup