Minor cleanup of unused params