Code cleanup

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>