Clean up API surface and weights