Remove lazyload for now