removed some stuff, wireless stuff