John Novak cleanup