Cleanup and support for null loaders