LPS-35786 Remove unused var?
LPS-33236 Add @Override