Fix compatibility with 7.4
Remove redundant imports