Remove some more unused stuff