Removed EnsureListIsLoaded where not required