Fix Rm Implementation and Makefile