Removed obselete callbacks.
Merged