removed stuff that should not be there