Remove more cruft
Correct URLs and simplify