Removed now useless code