removed the do_cmd macro which was only there because I forgot to remove it