remove some unsafe code that has long been dead