Use parse_dump and distinguish redirections
- Parse_dump makes things more easier
- Now all redirections can be simply extracted
- The redirections are removed from the lists by default

Change-Id: Ib38eca8e7d4adc00253797beb1a874c0b4c790db