Remove lazy loading