Removed unneccesary event handler
edits