Got rid of cmd API