Optimize controller init

(cc @kselden)