Clean up initialization functions