Fields cleanup