more dead/misplaced code