removed or moved orphaned methods
moved orphaned methods