Removed stuff not used here