Patching test, db-X-numbers
Ripping out more stuff
Merge branch 'bugfix/cleanup-checkpoint-nopurge' into bugfix/cleanup-checkpoint