Should be deleted rather than commented out