removed some stuff...