Cleaning the parser code

4 jobs for master in 7 minutes and 43 seconds (queued for 5 minutes and 56 seconds)