removed stuff for cleaning