Revert "Add Some Optimization from @Cl3Kener"

This reverts commit 605e4f5a7c092a80604edf7d2e54582af5c319fe.