Remove some vestigial code