Merge "Remove unused declarations"