HouseKeeping: remove unused and unneeded import statements

Removed unused and unneeded import statements; run "mvn -Pcheck clean install" and all is fine.