removed more unused code.