Cleanup, fixed clean in Makefile