Lots of cleanup and settings migration from 3.4.4