Make check fixes

Removing redundant and unused imports that make check pointed
out.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82@gmail.com>