More code cleanup

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>