Code cleanup

Signed-off-by: Victor Kleinik <x0150886@ti.com>