cleanup milestone II