Remove phased-out methods