Merge "don't call methods that are now removed"