improve performance, remove unused listeners