Math/Utils - various cleanup and deprecations/moves

- Put in the missing changes..