Merge "Clean up makefiles"