Remove guard
Kill some N+1 queries