Removed stuff we dont need any more