Remove references to CommandT