More cleaning of parameters