clean up SOI parser
clean up SOI parser

ferranti/watchdog,aaronsw/watchdog,aaronsw/watchdog,MjAbuz/watchdog,MjAbuz/watchdog,ferranti/watchdog,ferranti/watchdog,aaronsw/watchdog,MjAbuz/watchdog,MjAbuz/watchdog,ferranti/watchdog