Removed stuff not needed