[f16ref][gbox2.0] Removed more unused stuff