HHH-6638 remove needless annotation and import