Remove duplicate init code #7