Added some device token cleaning