Remove unsued import, adjust closure syntax