Killing duplicated parser code

Signed-off-by: José Luis Di Biase <josx@interorganic.com.ar>