Remove all unsafe, none were required.