Switched unlink/rmdir for using internal rm method