[refactoring] remove unused imports, simplify components a bit

parent 20235ac5
Pipeline #5640 failed with stage