up to 2.4.9
drop epoch 0, cleanups