Merge "Remove hidden API usage"