Revert "Revert "Removing Extraneous Code""

This reverts commit 83bdc03b9fe163054677563144ed56f6c1be408e.