Tai Bwo Wannai cleanup