Revert "Add Some Optimization from @Cl3Kener"

This reverts commit 75015a53b057de52f2fe71e2e3962e1d84a7952e.