Deleted portions that had been commented out