[bluebox|blb] some cleanup of model stubs