[cleanup] - optimized java imports