Removed uninintuitive links that complicated code and confused testers