Remove some obsolete defaces