Hotfix/generated hydrator removal

Handles #65