Remove unused qb_order property + other minor changes
2 files changed