Simplifying more by removing lazy load