This code is not used anymore, also fixing go-lint issues. Signed-off-by: Sébastien Han <seb@redhat.com>