This whole block can be removed rather than being commented out.