mod wanko and remove unnecessary