Adding cleanup.