Remove some more unused