remove obsolete links
fix markup