Revert "Added tweaks and clean up"

This reverts commit 04638b31028db9b808a8c16e3154c894d7e55505.