Clean up imports from code generation and EnumAdapter