Removed old callback code