removed vestigal code