WASHINGTON-The Senate voted to keep rent controls in its amendment-riddled OPA bill today but also ruled that OPA should not control rents in states setting up their own system of controls.