Remove old,  unused test code