remove useless code
Clean the code and start normalization