finished to clean up SFA_*_TYPE and the like