Ninja-like clean-up