Removed stuff that should have been ignored