Changed some main menu items
removed old funcs
moved CLI setup for csr
moved ssl cli out of main
more cleanup