Removed unnecessary event handler