PLA-354 strip some more domain polutions