Comment out AWS for testing