New TODO: make use of #listenTo + #remove approach