diff --git a/lib/pclsync/Makefile b/lib/pclsync/Makefile
index 82b7baa..a45cc83 100644
--- a/lib/pclsync/Makefile
+++ b/lib/pclsync/Makefile
@@ -43,8 +43,6 @@ OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o
 OBJFS=pfs.o ppagecache.o pfsfolder.o pfstasks.o pfsupload.o pintervaltree.o pfsxattr.o\
 	pcloudcrypto.o pfscrypto.o pcrc32c.o pfsstatic.o plocks.o
 
-OBJNOFS=pfsfake.o
-
 ifeq ($(USESSL),openssl)
   OBJ += pssl-openssl.o
   CFLAGS += -DP_SSL_OPENSSL
@@ -62,8 +60,8 @@ OBJ1=overlay_client.o
 
 all: $(LIB_A)
 
-$(LIB_A): $(OBJ) $(OBJNOFS)
-	$(AR) $@ $(OBJ) $(OBJNOFS)
+$(LIB_A): $(OBJ) 
+	$(AR) $@ $(OBJ) 
 	$(RANLIB) $@
 
 fs: $(OBJ) $(OBJFS)
@@ -73,12 +71,9 @@ fs: $(OBJ) $(OBJFS)
 debugfs: fs
 	CFLAGS += -DDEBUG_LEVEL=${DEBUG}
 
-cli: fs
-	$(CC) $(CFLAGS) -o cli cli.c $(LIB_A) $(LDFLAGS)
-
 overlay_client:
-	cd ./lib/poverlay_linux && make
+	cd ../poverlay_linux && make
 
 clean:
-	rm -f *~ *.o $(LIB_A) ./lib/poverlay_linux/*.o ./lib/poverlay_linux/overlay_client
+	rm -f *~ *.o $(LIB_A) ../poverlay_linux/*.o ../poverlay_linux/overlay_client
 
diff --git a/lib/pclsync/cli.c b/lib/pclsync/cli.c
deleted file mode 100644
index 85b1a09..0000000
--- a/lib/pclsync/cli.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright (c) 2013-2014 pCloud Ltd.  All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met: Redistributions of source code must retain the above
- copyright notice, this list of conditions and the following
- disclaimer.  Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with
- the distribution.  Neither the name of pCloud Ltd nor the names of
- its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL pCloud Ltd BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include "psynclib.h"
-
-int
-main() {
-  psync_init();
-  psync_start_sync(NULL, NULL);
-  psync_fs_start();
-  printf("Press enter to exit/umount\n");
-  getc(stdin);
-  psync_fs_stop();
-  psync_destroy();
-  return 0;
-}
diff --git a/lib/pclsync/pfsfake.c b/lib/pclsync/pfsfake.c
deleted file mode 100644
index bd5763c..0000000
--- a/lib/pclsync/pfsfake.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 
-   Copyright (c) 2013-2014 Anton Titov.
-
-   Copyright (c) 2013-2014 pCloud Ltd.  All rights reserved.
- 
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met: Redistributions of source code must retain the above
-   copyright notice, this list of conditions and the following
-   disclaimer.  Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution.  Neither the name of pCloud Ltd nor the
-   names of its contributors may be used to endorse or promote
-   products derived from this software without specific prior written
-   permission.
- 
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL pCloud
-   Ltd BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-   OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-   DAMAGE.
-*/
-
-#include "psynclib.h"
-
-int psync_fs_remount(){
-  return 0;
-}
-
-int psync_fs_isstarted(){
-  return 0;
-}
-
-int psync_fs_start(){
-  return -1;
-}
-
-void psync_fs_stop(){
-}
-
-char *psync_fs_getmountpoint(){
-  return NULL;
-}
-
-char *psync_fs_get_path_by_folderid(psync_folderid_t folderid){
-  return NULL;
-}
-
-void psync_fs_refresh(){
-}
-
-void psync_fs_file_deleted(psync_fileid_t fileid){
-}
-
-void psync_fs_folder_deleted(psync_folderid_t folderid){
-}
-
-void psync_fs_task_deleted(uint64_t taskid){
-}
-
-int psync_fs_need_per_folder_refresh_f(){
-  return 0;
-}
-
-void psync_fs_refresh_folder(psync_folderid_t folderid){
-}
-
-void psync_pagecache_resize_cache(){
-}
-
-int psync_cloud_crypto_setup(const char *password){
-  return PSYNC_CRYPTO_SETUP_NOT_SUPPORTED;
-}
-
-void psync_pagecache_clean_cache(){
-}
-
-void psync_fs_pause_until_login(){
-}
-
-void psync_fs_clean_tasks(){
-}