refactor(listeners) pop