Can you remove the redundant listener?