Removing dangerous stateful static stuff.