In particular, unused code that's presenting portability problems. From-SVN: r181241
From-SVN: r181233
From-SVN: r181154