[andrew_testing]: Merge pull request #583 from andrew-bierman/fix/cleaning-up-combined-…

[andrew_testing]: Merge pull request #583 from andrew-bierman/fix/cleaning-up-combined-… #21