Remove more deprecated methods and refactor them out of existing code