Cleanup some QP ugliness