simplify cleanup