Remove Extra CB

* remove extra callback...

Fix #2044