Cleans up controllers to prevent N+1 queries