Removed unneeded DTO and parser cruft.
Lots of changes, still messing around.