Fixed cleaning up eventhandler on destroying