Keep only the lazy digging, no need for it on load