Ripping out more unused code and cvars.