(Maint) Remove unused variables