remove JAAS and update some models