Remove unnecessary listening