Removed the handler-ish code