Remove broken links
Merging changes