Added cli cleanup script
Prepared bootstrap for cli use