ENYO-690: Initial clean-up of parsing.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
Merge pull request #974 from enyojs/ENYO-690-rem-aarontam

ENYO-690: Initial clean-up of parsing.

Integrated-By: Aaron Tam (aaron.tam@lge.com)