move to updated cc1200 symbol, clean up some trace overlaps