This is to clean up prior to further changes.
Signed-off-by: NDavid Dillow <dillowda@ornl.gov>