merge cruft, removed.