removed things that shouldnt be there