Remove defunct stuff