remove double field removal
fix tests