removed some stuff;