Cleanup fillFormCtrl