Updated remove_rjs branch.