goober Merge pull request #682 from walles/walles/unused