Remove unused field
Fix test failures