cleaning up after last merge. it didn't complete correctly.