some tainting clean ups