Removed remaining cruft.