Remove some more unused things