Remove commented property which isn't used
Improve quoting in parsing