Activated some links.
Trimmed some unnecessary code.