Charges dropped in cartoon controversy