link fix / remove commented code