Removed stuff, altered links