0720whitten cleanup 5