diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
index 4a4be854..1e11494c 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
@@ -99,9 +99,6 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
                     activity.isBottomSheetInPeek(true);
                     activity.setBottomSheetMusicInfo(mix.get(0));
 
-                    PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
-                    playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
-
                     MusicPlayerRemote.openQueue(mix, 0, true);
                 }
             }, SyncUtil.SONG, songs.get(getBindingAdapterPosition()).getId(), PreferenceUtil.getInstance(context).getInstantMixSongNumber());
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
index 5def73ad..6d5e9e7b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
@@ -94,9 +94,6 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
             mainActivity.isBottomSheetInPeek(true);
             mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
-            PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
-            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
-
             MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
index a4dc2901..28ce7d1b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
@@ -99,9 +99,6 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
             mainActivity.isBottomSheetInPeek(true);
             mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
-            PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
-            playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
-
             MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
index 6b4168fa..9bb5bbe0 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
@@ -235,7 +235,6 @@ public class SongRepository {
     }
 
     public void increasePlayCount(Song song) {
-        Log.i(TAG, "increasePlayCount: " + song.getId());
         boolean isIncreased = song.nowPlaying();
 
         if(isIncreased) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index f7e92b54..c8b82f10 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -262,8 +262,6 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
     }
 
     private void setSongInfo(Song song) {
-        playerBottomSheetViewModel.setNowPlayingSong(song);
-
         bind.playerBodyLayout.playerSongTitleLabel.setText(song.getTitle());
         bind.playerBodyLayout.playerArtistNameLabel.setText(song.getArtistName());
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
index 09cc488e..0309ddc8 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
@@ -101,9 +101,6 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
                     activity.isBottomSheetInPeek(true);
                     activity.setBottomSheetMusicInfo(mix.get(0));
 
-                    PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
-                    playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
-
                     MusicPlayerRemote.openQueue(mix, 0, true);
                 }
             }, SyncUtil.SONG, album.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
index b1ac2913..a7cd83ec 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
@@ -90,9 +90,6 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
                     activity.isBottomSheetInPeek(true);
                     activity.setBottomSheetMusicInfo(mix.get(0));
 
-                    PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
-                    playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
-
                     MusicPlayerRemote.openQueue(mix, 0, true);
                 }
             }, SyncUtil.SONG, artist.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
index 31da0e81..fd5f7ff1 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
@@ -108,9 +108,6 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
                     activity.isBottomSheetInPeek(true);
                     activity.setBottomSheetMusicInfo(mix.get(0));
 
-                    PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
-                    playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
-
                     MusicPlayerRemote.openQueue(mix, 0, true);
                 }
             }, SyncUtil.SONG, song.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
index e0332b0d..86ec6a71 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
@@ -27,8 +27,6 @@ public class LibraryViewModel extends AndroidViewModel {
     private LiveData<List<Album>> sampleAlbum;
     private LiveData<List<Artist>> sampleArtist;
     private LiveData<List<Genre>> sampleGenres;
-
-    private LiveData<List<Genre>> allGenres;
     private LiveData<List<Playlist>> allPlaylist;
 
     public LibraryViewModel(@NonNull Application application) {
@@ -44,17 +42,13 @@ public class LibraryViewModel extends AndroidViewModel {
         sampleAlbum = albumRepository.getListLiveSampleAlbum();
         sampleArtist = artistRepository.getListLiveSampleArtist();
         sampleGenres = genreRepository.getListLiveSampleGenre();
+        allPlaylist = playlistRepository.getListLivePlaylists();
     }
 
     public LiveData<List<Playlist>> getPlaylistList() {
-        allPlaylist = playlistRepository.getListLivePlaylists();
         return allPlaylist;
     }
 
-    public List<Genre> getGenreList() {
-        return genreRepository.getListGenre();
-    }
-
     public LiveData<List<Album>> getAlbumSample() {
         return sampleAlbum;
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/MainViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/MainViewModel.java
index 0c3c539d..25ed2d31 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/MainViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/MainViewModel.java
@@ -24,8 +24,4 @@ public class MainViewModel extends AndroidViewModel {
 
         return true;
     }
-
-    public void deleteQueue(){
-        queueRepository.deleteAll();
-    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
index 40b2d835..9f053853 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
+import com.cappielloantonio.play.helper.MusicPlayerRemote;
 import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.repository.QueueRepository;
 import com.cappielloantonio.play.repository.SongRepository;
@@ -14,11 +15,11 @@ import java.util.List;
 
 public class PlayerBottomSheetViewModel extends AndroidViewModel {
     private static final String TAG = "PlayerBottomSheetViewModel";
+
     private SongRepository songRepository;
     private QueueRepository queueRepository;
 
     private LiveData<List<Song>> queueSong;
-    private Song song;
 
     public PlayerBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -33,23 +34,12 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         return queueSong;
     }
 
-    public void setNowPlayingSong(Song song) {
-        this.song = song;
-    }
-
     public void setFavorite() {
+        Song song = MusicPlayerRemote.getCurrentSong();
         song.setFavorite(!song.isFavorite());
         songRepository.setFavoriteStatus(song);
     }
 
-    public Song getSong() {
-        return song;
-    }
-
-    public void setSong(Song song) {
-        this.song = song;
-    }
-
     public void orderSongAfterSwap(List<Song> songs) {
         queueRepository.insertAllAndStartNew(songs);
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
index 5f8a8645..66d676bb 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
@@ -36,11 +36,7 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
     }
 
     public void setFavorite() {
-        if(song.isFavorite())
-            song.setFavorite(false);
-        else
-            song.setFavorite(true);
-
+        song.setFavorite(!song.isFavorite());
         songRepository.setFavoriteStatus(song);
     }