Add commandline tools to cleanup