Remove methods that are only used when they are tested

This PR removes methods that either were completely unused or only used when the methods themselves were tested.