Remove unused code / dead signatures