PEP8, removing unused utility class

I though I might as well do this now, to have fewer merge-conflicts later.