Clean redundent variables