Remove unused methods and corresponding test

[saknopper]

Initially I wanted to fix a mistake I made in 0e8fca6cd0763f29ef91266e3f954dc9517022e2 but then I realized these methods aren't used anywhere except for a test. So I assume it's safe to remove them.