Remove AWS stuff