Removed stuff not-needed