Add in remove listener commands