remove leftover tapir:: references