initial cleanup; hit refactor error