Merge "CSD: remove unused library" into main