MAME as a submodule, some more deletes