General cleanup after the mess of tweaks.