otshell: cleaning up
otshell_utils more cleanup