Fixed dir_remove to handle files again