remove more pyparsing, closes #6, closes #20