Folder cleanup fix