Clean up & de-exposure of models