Fixed issue: Removed redundant code, added missed link