Cleaned up a few code branches
Revert "Cleaned up a few code branches"

This reverts commit 5bcd7b4082fd51705b324a06aa746201e4c7581e.