Upgrade React and tidy up.