Completing code generation on the hydrator
Removing optimization leftovers