removed stuff that doesn't matter