PQ code cleanup

BASH
PQ code cleanup

BASH