Removed vestigal code