Revert "June/July Code Combination"

This reverts commit 9e8bf999e807922087fb667b700458bb9334873a.