remove depreciated fields
add app principal type as valid