Remove some unnecessary extra init code