Merge "Remove redundant declarations." into integration