Remove this. Create new listener if needed.