This is a clean up, there seems to be legacy calls from before the form was refactor. This speeds up form rendering by a lot.