removed more unused values