Changes: - revert the scheduler "fixes" trying to reduce the number of "split upgrades", it causes ordering issues - plug some leaks - fix some sqlite statement leak