Removed lazy loading policy