Merge "Remove copies of same functions"