Removing extract fields control. Fixing code layout.