Remove unused and unnecessary code

Two of these modules were not being used and the other one is redundant as the
methods within it are only being used in one place.