Comment some unused code