0720whitten cleanup 4