models: some more cleanup.