removed redundant listeners