Change direction: no bookeeping, regenerate all annotations
Remove bookkeeping methods