Merge "Remove unused include"