remove unused code
use includes to avoid N+1 queries