To remove confusion, remove unused code.