removed some remnants of yatta