Add some checks on removes in Makefile