lots of mnt tools cleaned up