Remove cruft, update some links