Another cleanup := make it equal to OpenILDA