similar methods deleted

NOT for merge, only for review. Not all classes are tested.