clean up the command/shell/builder mess