Removed code made obsolete from prior changes.