Clean inconsistent "none" and empty conventions for advanced fields