Revert "General Adjustments"

This reverts commit ff1052d1919fbc0e36377b8fa1db023a1d517d89.