re-enabling cleanup code