moves many bijections to Abstract/removes dead code