AQCU-1608 attempt to rework and clean up
AQCU-1608 attempt to rework and clean up

zmoore-usgs/repgen,USGS-R/repgen,zmoore-usgs/repgen,mhines-usgs/repgen,mhines-usgs/repgen,mhines-usgs/repgen,USGS-R/repgen,zmoore-usgs/repgen,USGS-R/repgen