Merge pull request #1689 from alexrp/remove-cruft