Final cleanup, wording