Remove unused
Merge pull request #2620 from tricknotes/remove-unused

Remove unused