Removed redundant listeners class