Field cleanup and performance improvements