City Drops Plan to Charge Rent to Shelter Residents