[enh] cleanup