Remove appid and afid literal