Remove Old Callbacks

Removed old callbacks and riot objects