remove unused anallytical homogenzier
more RHS refactoring