[D#480] more cleanup