Remove unused variable
Merge branch 'master' into refactor/ease_pqb_customization