diff --git a/components/Artist/component.tsx b/components/Artist/component.tsx
index 503d23c7..62d1587b 100644
--- a/components/Artist/component.tsx
+++ b/components/Artist/component.tsx
@@ -43,8 +43,7 @@ export default function Artist(props: ArtistProps): React.JSX.Element {
                             <Card
                                 caption={album.Name}
                                 subCaption={album.ProductionYear?.toString()}
-                                width={200}
-                                marginHorizontal={20}
+                                marginHorizontal={10}
                                 cornered 
                                 itemId={album.Id!}
                                 onPress={() => {
diff --git a/helpers/mappings.ts b/helpers/mappings.ts
index b3a64fd9..f71f6126 100644
--- a/helpers/mappings.ts
+++ b/helpers/mappings.ts
@@ -12,6 +12,8 @@ const transcodingContainer = "m4a";
 
 export function mapDtoToTrack(api: Api, sessionId: string, item: BaseItemDto, queuingType?: QueuingType) {
 
+    console.debug(`Mapping item to track: ${item.Id}, ${item.AlbumId}`)
+
     const urlParams = {
         "Container": container,
         "TranscodingContainer": transcodingContainer,
diff --git a/player/queries/playback.ts b/player/queries/playback.ts
deleted file mode 100644
index f245ef13..00000000
--- a/player/queries/playback.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { useQueries, useQuery, UseQueryOptions, UseQueryResult } from "@tanstack/react-query"
-import { getActiveTrack, getProgress, pause, play } from "react-native-track-player/lib/src/trackPlayer"
-import { getPlaystateApi } from "@jellyfin/sdk/lib/utils/api/playstate-api"
-import { Progress, Track } from "react-native-track-player";
-import { QueryKeys } from "../../enums/query-keys";
-import { Api } from "@jellyfin/sdk";
-import { useApiClientContext } from "../../components/jellyfin-api-provider";
-
-const usePause : UseQueryOptions = {
-    queryKey: [QueryKeys.Pause],
-    queryFn: () => {
-        return pause();
-    }
-}
-
-const usePlay : UseQueryOptions = {
-    queryKey: [QueryKeys.Play],
-    queryFn: () => {
-        return play();
-    }
-}
-
-const useProgress : UseQueryResult<Progress, Error> = useQuery({
-    queryKey: [QueryKeys.Progress],
-    queryFn: () => {
-        return getProgress()
-            .then((progress => {
-                if (!!!progress)
-                    throw new Error("Tried to fetch progress when there wasn't a currently active track");
-            }));
-    }
-});
-
-const useReportPlaybackStarted = {
-    queryKey: [QueryKeys.ReportPlaybackStarted],
-    queryFn: () => {
-        getActiveTrack()
-        .then(track => {
-            if (!!!track) 
-                throw new Error("Tried to report playback when there wasn't a currently active track");
-            
-            return track as Track;
-        })
-        .then(track => {
-            getPlaystateApi(useApiClientContext().apiClient!)
-                .reportPlaybackStart({
-                    playbackStartInfo: { 
-                        ItemId: track.id, 
-                        PositionTicks: useProgress.data!.position 
-                    }
-                });
-        });
-    }
-}
-
-const useReportPlaybackStopped = {
-    queryKey: [QueryKeys.ReportPlaybackStopped],
-    queryFn: () => {
-        getActiveTrack()
-        .then(track => {
-            if (!!!track) 
-                throw new Error("Tried to report playback stopped when there wasn't a currently active track");
-            
-            return track as Track;
-        })
-        .then(track => {
-            getPlaystateApi(useApiClientContext().apiClient!)
-                .reportPlaybackStopped({
-                    playbackStopInfo: { 
-                        ItemId: track.id, 
-                        PositionTicks: useProgress.data!.position 
-                    }
-                });
-        });
-    }
-}
-
-export const useReportPlaybackProgress = {
-    queryKey: [QueryKeys.ReportPlaybackPosition],
-    queryFn: () => {
-        getActiveTrack()
-        .then(track => {
-            if (!!!track) 
-                throw new Error("Tried to report playback progress when there wasn't a currently active track");
-            
-            return track as Track;
-        })
-        .then(track => {
-            getPlaystateApi(useApiClientContext().apiClient!)
-                .reportPlaybackProgress({
-                    playbackProgressInfo: { 
-                        ItemId: track.id, 
-                        PositionTicks: useProgress.data!.position 
-                    }
-                });
-        });
-    }
-};
-
-export const usePauseAndReportPlaybackStopped = useQueries({
-    queries: [useReportPlaybackStopped, usePause]
-})
-
-export const usePlayAndReportPlayback = (api: Api) => useQueries({
-    queries: [useReportPlaybackStarted, usePlay]
-})
\ No newline at end of file