Remove now useless code