[RP,SE]{refactoring} IXX - final commit.