Generated hydrator removal

Handles #65