removed stuff that's not needed