add tapiro, remove dump code