Interim cleanup
Cleanup SI Parsing
More cleanups