Unused field cleanup