Added extra link

Added extra link on request, removing some dead code
Cleanup