Clean up type loading