Remove unused definitions

Authored by tcanabrava on Jun 17 2019, 12:27 PM.