Removed old annotation handler