clean up on cmd-tool