eager loading cleaned up