cleaned up residual changes