Framework level cleanup