React Fields Cleanup