remove db joins for simplicity