Gradual transition to removing CommandParts altogether. - Move logic from CommandParts to utils classes