#3868: Cleanup