Remove eager loading