Removed hydration on demand