Remove some old code. Fix of some bugs, the algorithm was not getting all information in the parse.