Smarter quote removal