Removed superfluous event handler