removed things that don't seem necessary