got rid of some vestigial code