tweak cli steps to cleanup, grabbed a few bits from aruba and removed gem dep