Clean up sourcing