models: some cleanup.