[FIX] Remove old query remnants