Massive code cleaning, redundancies(imports/vars)