Removed redundant listener