Merge "remove redundant @hides"