Add generate command, cleanup other commands