rm link and comment
Merge branch 'master' into rmlink