removed some stuff that isn't used