remove unnecessary imports.
fix nullable/nillable quirks. #285