Utils: Deprecate some methods, small refactoring.