Add new entity to store device id for push notification
Remove unused code