removed some stuff that wasn't used