Remove cleanup cleanly.