More MRJ related cleanup.