final cleanup for solarized swapping/ submodule upgrade