Math/Utils - various cleanup and deprecations/moves

- And one last before..