Issue #44 - remove unnecessary links