Revert "Major Updates"

This reverts commit 7c17a109061d6d3a9f238db64ada804458e9e36e.