Merge "Code cleanup: Remove unused typedefs and declarations."