Removed some more uunused

I don't think there are side effects.