cleanup
do not try to skip last steps anymore
first attempt to handle renumbering