Useless code cleaning