More AWS removal