Library - step one and half

More removal of links.
Commented unused variables

-