Fix broken makefile again; also clean up targets