Cleanups on fields