Cleanup and BambuXp work, not finished.