cleanup for the rest chapter