removed more unused code
removed more unused dependencies