cleaned up some vestigial code