Remove initialization list in all code