Commented out some unused code