Change Makefile and cleanup