more clean ups from merge.