removed some stuff that doesn't work