[Olena-patches] [Olena] #158: Clean up complex-based images