Rework closure flow
Remove excess use strict code