More arshidni cleanup.