removed some vestigial code