Remove references to TTapi, pms