update model code, remove spurious argumentation