Misc cleanup and disk space optimization.