removed stuff that cant be there