more unreferenced parameter cleanups