removed stuff that should have been ignored in the first place