removed things that weren't needed