Clean up callbacks

Clean up callbacks