modular tools cleanup