removed some stuff that shouldn't have been there