Reordering of execution cleanup in solution.js