removed some stuff that wasn't doing anything