makefile cleanups