More Arshidni clean-up.