Simplification
Removed unused field