YADA cleanup