commented out some warning-causing unused code