Remove unused imports [MJ-480]