Should this be removed rather than commented out?