Field cleanup and set some deprecated