Alle these should hopefully not be needed anymore, with the workaround for the
race condition in ace engine.

Signed-off-by: Esben Haabendal <esben@geanix.com>