Further decont cleanup