More file/folder cleanup