VID-1946 Pull lazy load setting into separate method
VID-1946 Remove unused parameters