scheduler: makefile & unused imports fixes