some more unused stuff removed