more file/folder cleanup