cleanup prep for yellow5 merge