fix imports and spurious annotations