Made some Makefile clean up for P3