Revert "checkpoints & minor upgrades"

This reverts commit 61b778974b929e6caee0d591731373dacc25a1f0.

Conflicts:
	src/checkpoints.cpp