Remove old links
Merge branch 'master' into production