Get rid of initialization arguments