Replace cleanup with erwins cleanup