Remove more deprecated/overloaded methods
11 files changed