[enh] Cleanup