Signed-off-by: Francois Berder <18538310+francois-berder@users.noreply.github.com>
This commit also removes not needed use of export