cut out some unused code