Clean Kernel to not depend on Oro's one which is too magic