removed unnecessary imports + fixed lint bugs