Maven dependency cleanup and unused imports cleanup