Manual cleanup since merge.