Removed unused links
Some minor cleaning up
Bare bones version for now