removed stuff
merged