ISSUE_28 #28 Removed old links