Remove old deprecated code.
Merge pull request #1347 from drak/trimming

Remove old deprecated code.