Revert "More Improvements"

This reverts commit 9070fd04cfea6aedb74407e13dcdf883bf5eb60c.