Excised useless code