expression cleanup