[CLEAN] Clean useless code