Cleanup

Some cleanup

Signed-off-by: Mykhailo Lysenko <mykhailo.lysenko@globallogic.com>