Parser cleanup