Merge "Remove spurious function declaration"