Form model usage cleanup