Removed more unnecessary event stuff