Clean up null option explicitly, instead of tracking change event