Stricter cleanup