Getting rid of junk fields