removed more unused code