Remove unused code, which had been commented out.