Merge pull request #355 from peternewman/e1.37-2

Remove some redundant code