#50 Removed old handler