(maint) Cleanup an unused variable and an unintended array assignment