Should we delete this rather than commenting it out?