Clean up of parameters on some layouts