removed more unused stuff