Framework cleanup still going