chore(refactor): reverted unneccessary changes
chore(refactor): remove unused method removeListener