Tools cleanup