Add deprecation funcs to Utils and minor cleanup.