Clean of useless code