move trap to after rhsm register