Merge "Remove old headers and libraries."