task #246: Shift service integration, clean unsued imports