removed stuff, that will probably not be used.