Remove ~6 year old cruft