More models cleanup.