got rid of vestigial code