Removing Lazy Load for Now