Get rid of command line input steps