removed some stuff that shouldnt be there