Add todo and rm legacy tap