Removed uses of deleted redundant numerical field classes