Remove extract() from widgets