DDC-3078 - removing unused imports