Folder cleanup fixes