MarkupCalculator cleanup
Sample files removed