Remove some singleton intialization