Lazy load
Fixing mock-server
Remove unused combinator