Improved cleanup. Scalpel now outputs to the cmd.