removed some stuff
merged