Prevent old completions, plus major refactor