Finish off remove, didn't bother testing it on folders