Code cleanup: remove unused definitions

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>