Add missing imports and removed useless one.