Revert "-Cleaned up some code from merging"

This reverts commit 628d21836f5edf56d2eaa8b03c2fddce6931e609.