Removing an unncessary event handler