removed some stuff maybe