Hydrator cleaned up