cleanup some extraneous params