fixed removed stuff