Cleanup checkpoint
Interpretations parsing cleanup + tests