Cleanup of old stuff
Fix a Callback issue