Merge "Clean up Makefile"