Fix the way we remove integer fields