JOJ-24: Remove imports