Shift to state law: City rescinds drug ordinance, follows only state law