Clean up initialization