Clean up initialization code