commented out some unused code