Use new init function registering mechanism
Removed unnecessary init function