Parser cleanup delete complete bugfix