Fix cmd breakage, remove flag dep