Merge "Remove redundant header"