Removed ancient cruft!