removed some more unused stuff