Removed unnecessary lazy loading