Cleanups for solarized