removing more vestigal code