fixed more removed stuff