diff --git a/.gitignore b/.gitignore
index 28d2152066..1a132fbd29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,7 +175,6 @@ retroarch_switch.nso
 # PS2
 ps2/irx/*.c
 *.irx
-ps2/libcdfs/lib/
 
 # Wayland
 gfx/common/wayland/idle-inhibit-unstable-v1.c
diff --git a/Makefile.ps2 b/Makefile.ps2
index d375b41b2a..8f094432c2 100644
--- a/Makefile.ps2
+++ b/Makefile.ps2
@@ -1,10 +1,8 @@
-BUILD_FOR_PCSX2    = 1
+BUILD_FOR_PCSX2    = 0
 DEBUG              = 0
-HAVE_KERNEL_PRX    = 0
 HAVE_LOGGER        = 0
 HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 0
-BIG_STACK          = 0
 MUTE_WARNINGS      = 1
 PS2_IP = 192.168.1.150
 
@@ -36,10 +34,9 @@ ASFLAGS = $(CFLAGS)
 RARCH_DEFINES += -DPS2 -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI
 RARCH_DEFINES += -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
 
-LIBDIR =
 LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
-LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lpadx -lmtap -lmc -lhdd -lfileXio -lz
-LIBS += -lpatches -lpoweroff
+# Lib cdvd is needed to get proper time
+LIBS += -lretro_ps2 -lpatches -lpoweroff -lgskit -ldmakit -laudsrv -lpadx -lmtap -lz -lcdvd
 
 ifeq ($(BUILD_FOR_PCSX2), 1)
 RARCH_DEFINES += -DBUILD_FOR_PCSX2
@@ -53,14 +50,6 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS += -DHAVE_FILE_LOGGER
 endif
 
-ifeq ($(HAVE_KERNEL_PRX), 1)
-CFLAGS += -DHAVE_KERNEL_PRX
-endif
-
-ifeq ($(BIG_STACK), 1)
-CFLAGS += -DBIG_STACK
-endif
-
 CFLAGS += $(RARCH_DEFINES)
 
 # All the IRX objects
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index c88bec2733..a59d289946 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -22,15 +22,14 @@
 #include <sifrpc.h>
 #include <iopcontrol.h>
 #include <libpwroff.h>
-#include <libmc.h>
 #include <libmtap.h>
 #include <audsrv.h>
 #include <libpad.h>
 #include <ps2_devices.h>
 #include <ps2_irx_variables.h>
 
-char eboot_path[512];
-char user_path[512];
+static char eboot_path[512];
+static char user_path[512];
 
 static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE;
 
@@ -92,17 +91,6 @@ static void create_path_names(void)
 
 static void poweroffCallback(void *arg)
 {
-#if 0
-	/* Close all files and unmount all partitions. */
-	close(fd);
-
-	/* If you use PFS, close all files and unmount all partitions. */
-	fileXioDevctl("pfs:", PDIOC_CLOSEALL, NULL, 0, NULL, 0)
-
-	/* Shut down DEV9, if you used it. */
-	while(fileXioDevctl("dev9x:", DDIOC_OFF, NULL, 0, NULL, 0) < 0){};
-#endif
-
 	printf("Shutdown!");
 	poweroffShutdown();
 }
@@ -188,10 +176,6 @@ static void frontend_ps2_init(void *data)
    /* CDVD */
    SifExecModuleBuffer(&cdfs_irx, size_cdfs_irx, 0, NULL, NULL);
 
-   if (mcInit(MC_TYPE_XMC)) {
-      RARCH_ERR("mcInit library not initalizated\n");
-   }
-
    /* Initializes audsrv library */
    if (audsrv_init()) {
       RARCH_ERR("audsrv library not initalizated\n");