Remove the singleton stuff and add custom init. Minor code clean.