Remove deprecated Commandlistener