misc cleanup

deleted some unused code