remove dead methods and tests, reorganize