Revert "Removing Extraneous Code"

This reverts commit b536a9e38cde586dea3743817743d4a96c31cabb.