Add missed imports and remove unused