Upgrade to 3.4 and start of tidy up.

Upgrade to 3.4 and start of tidy up.