Replace cleanup script with Makefile targets
Fix singular grammar