Delete commented code.
Improved field diagnostic output