CLEANUP - Removed unused duplicate folders