Removed useless imports to clear Sonar Issues