cleanup before another code review, got rid of aws_dir