Removed obsolete handler