remove more explicit cleanup code