Removed unused listener and commented other ones.