Remove unnecessary import add as required