Still some leg-work on sanitizing sources