Source cleanup pass