[UPDATE] Removal of AWS Keys