CEDEX-0000 cleanup