Removed unused debugging fields