First round of init cleanup- without property cleanup