Cleanups to Makefile