Clean up vitals loading (slightly)