consolidate cleanup/propagate parameters