Removed unnecessary listener