Removed stuff not used anymore