removed stuff that is not used
 some more stuff