m0d_sa check. Code clean-up.