Added some links and removed unused code