Remove redundant AWS config, put some VBox config at top-level