Clean up some charity and merchant stuff