Removed stuff not used