* extract KeyValuePair class into own class and make everything inline
* removed the old parsing code - that's why we have version control