Clean up loading a bit.