More unused work, and two unnecessary methods removed.