Revert "Update Classes and Methods and remove deleted ones"

This reverts commit 2f2a8f013c66d47a4d2bf0c8c246b7d7a51a11af.
Fixed Trunk on this branch
Merge branch 'master' into BranchToBecomeHead