Remove private aws properties, duplications