Merge "Increase static linkage, remove unused functions"