Remove unused and old keyword Id expansion lines