Deprecate some methods and simplify logic.