Comment out aws and sort