cleared out some unused code