Clean up callbacks
Merge pull request #64 from manover/cleanup_callbacks

Clean up callbacks