Removed build form, updated closures