General quotes clean-up.