[fix] Remove listeners in 2 locations