Nokia to kill Ovi, market products under Nokia brand