Deleted some deprecated defensive code.