Fix and migrate Tree commands to new format. Remove CommandMC