Cleaning useless code