That BB8 all-night swimming task needs to be done again. Definitely.
A) Because they have a bigger and longer pool, this year. So it will work perfectly.
B) What happened to Emma saying "Days will turn into nights" - obviously hinting things that usually happen in the day like tasks, will happen at night. We haven't had any of that yet.
Plus imagine the natural conflict it will bring.
Another series of empty promises.