Clean up more quotes