Remove abstract hydrator from general service manager.

This is an additional PR for #26 which will fix the remaining issue in #25