Remove defunct code