Revert some changes as they were not tested or are not required