Shell and CDTool clean up