remove db queries