removed some stuff ...