rhs assembler cleanup