Optimized django queryset use
Remove unused variables
Merge branch 'saulshanabrook-feature/query-optimizations'