Jenkins stabilization and clean up of unusued imports