namespace move and remove deprecated