Remove some more uneeded code.