I thought this PR was about moving away from Java interfaces so this comment is not relevant anymore, right?