removed stuff that is unnecessary