removed more event stuff
and more events removed