Final cleanup remaining