Remove old init stuff