Correct. One goal, which carries a necessary second:
Move Hosnian Prime’s destruction to after Han’s death.
Do the little things to make it work (clean up the mess).
I think I may cheat slightly by also removing Threepio’s line, “It is very unlikely that R2 would have the rest of the map in his backup data.”