Fixed unused imports preventing compiling